Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:54:50 +0000 (18:54 -0500)
committerChong Yidong <cyd@stupidchicken.com>
Mon, 31 Jan 2011 23:54:50 +0000 (18:54 -0500)
commit90c5f2b56a9eb0dc36f60aa6779c67a84585c242
treed790188620ee9eff9b971c4746eb2c69fd7625c2
parent448e06da9fcc39215a2d4e50bef1e4680ce6345f
parent04ee46e727e9a8624ecdbd7f2175172d306dcec5
Merge changes from emacs-23 branch
26 files changed:
ChangeLog
configure
configure.in
doc/emacs/ChangeLog
doc/emacs/files.texi
doc/emacs/search.texi
doc/lispref/ChangeLog
doc/lispref/display.texi
doc/lispref/elisp.texi
doc/lispref/keymaps.texi
doc/lispref/vol1.texi
doc/lispref/vol2.texi
lisp/ChangeLog
lisp/emacs-lisp/shadow.el
lisp/erc/ChangeLog
lisp/erc/erc-track.el
lisp/files.el
lisp/image-dired.el
lisp/international/quail.el
lisp/mouse.el
lisp/msb.el
lisp/progmodes/cc-cmds.el
lisp/progmodes/cc-engine.el
lisp/term/ns-win.el
src/ChangeLog
src/image.c